misc comment and cleanup