Cleanup

Just some cosmetic cleanups and re-indentation (perltidy)