Simplifying naming, cleaning up whitespace