Reformat code
classification utils added