Fixed CodeNarc violations, added strong type to fields and methods