Fixed some minor inconsistencies in use of white space and naming.