more refactoring and style changes
more refactoring and style changes
added test for getClassify()