Wash, rinse, and repeat

Removing dead code and improving readability
:thumbsup: