Cleanup

Gist: https://gist.github.com/Neob91/efe533c147b931f39030