Cleaning up authentication erb, still work in progress