Make methods static
Cleanup
Convert / remove align attributes