Optimizations
alphabetical order, indentation
Merge pull request #43 from DaaOtt/master

optimizations, organizations