Fixed some of the code layout.