Improved comments, improved readability