code cleanup + started to add user auth