Cleanup spaces and such to meet coding specs

Remove testing artifacts

Update man page documenation