CS fixes and improved docblocks