Refactored the comments: made more consistent, improved a few things