Based on a tutorial for code refactoring - View it on GitHub