Fixed some code layout issues.