Many adapptions

Tried to follow Perl::Critic

Altough, this is a little bit too harsch in my opinion...
Nix