Fix CS and docblocks
Update documentation