linted and OPTIMIZED
Revert "linted and OPTIMIZED"

This reverts commit 02a2805c81ce0e54e322423f0b007c79f8e933a2.
linted and OPTIMIZED
Merge pull request #1 from psychobunny/troll-branch-is-troll

linted and OPTIMIZED
Merge pull request #1 from psychobunny/master

linted and OPTIMIZED