Cleanup

Fixed some formatting issues that were getting in the way of a
successful compile. Now the project seems to build without any issues.
No errors.