CS fixes and improved docblocks

Please limit line lengths to 80 characters.