Add docblocks + CS fix