Cleaned up comments and code spacing