fix CS & Docblocks