Clean classes
Reorder functions and includes, fix formatting, remove unnecessary comments, includes and properties