code cleanup

Signed-off-by: john mcconnell  johnmcconnell@yahoo.com
lay out fixes first pass

Signed-off-by: john mcconnell  johnmcconnell@yahoo.com