Change indentation style and get rid of unused class