fix some scrutinizer issues
fix some docblocks