Add user-class option in help text and minor clean up