Clarify some naming, and also do the OCD thing and clean up whitespace