Minor fixes

Made minor fixes to usage. Minor code cleanup.