Cleaning up, update login