General module cleanup + I am a hipster