Cleaned up some of the formatting, spacing and missing semicolons.