General code cleaning

Wash dat code