linted and OPTIMIZED
Merge pull request #1 from psychobunny/troll-branch-is-troll

linted and OPTIMIZED