Fixing VCM from Codeclimate (2)