Cleanup help messages
Code cleanup, cleanup help messages