Refactor user info update and select course