Code clean up and some review changes for user module