Classificaiton working very well. Refactoring and polishing code.