Changed Classification to return Int instead of Double

Also minor changes to formatting and comments