Cleanup stylistic issues with code.