Style - Address CodeNarc issues