Major cosmetic updates

Signed-off-by: JB Touchard <jbt@txtnet.com>