Adding auth and formatting
Improvements