PSR fixup and adding update user functionality