Cleaned up some things recommended by Perl::Critic