Various changes

Mostly beautyfying and removal of most Perl::Critic criticisms.