Some Refactor, adding some login details