Refactoring.
upgraded to CodeNarc v0.19