code refactoring & AuthHelper added to the project