fix CS and docblocks