Fixed according to Codenarc advice