Addressed perlcritic issues