Converting over old methods to new classes
Remove console logs
Appease JSHint checks