Cleaned up comments and code formatting
More code formatting