moved password funcs around
more formatting