Prompt for username and passowrd, some code cleanup