Updated some code layout to maintain consistency.