Refactor methods to be class methods
Remove comments