Cleaned up comments, whitespacing