Removed class and improved comments.