Remove wrong parens
Edit message
User 'after' function everywhere
Merge pull request #328 from my-personal-forks/refactor

Refactor