Clean ups

Various code clean ups to improve layman logic and man page structure.