Cleaned up authentication