Tidied up calc + update user