Fixed some formatting issues and simplified a piece of code.