Formating and syntax fixes that were pointed out during code review.