Cleaned up the comments and made them more consistent.