Finished formatting some of the code.