Code style
Code style
Create methods for re-appearing code
Move class to its own file