Refactoring exercise where data layer and business layer are not clearly separated - View it on GitHub