Small cosmetic changes
Attempt to improve
Works faster with macroses

Now it's almost unreadable, but faster :)