Working on cleaning up login