Tidy up code
Reformat file
Tidy up code
Moved class methods to companion object