Finished Cleaning & Formatting for now

When I will update my mod to 1.8, I will use the chance to rewrite some
stuff :)