code refactoring and oDesk auth support