Cleaned up formatting and comments