Run a quick pass of code cleanup