Fixed spacing and some code to adhere to standards. Refs #414