Fixing VCM from Codeclimate