Cleaned main class of comments