Pure Refactoring. Moved methods into an order that makes more sense.
Also: Renamed static Variables.