small things / cleanup

removing unneeded includes, inserting brackets, capitalising class names, moving class specific things into that class, preventing copies