Fixed injection on Helpers and Auth, refactored code