Adding user name update and controllers clean up