touch up on code quality