cleaned up a bit more login