Tidy up code
Create Utils for reading from console
Reorder arguments in constructor