Improve output formatting
Improve error handling + output
Use constant instead of hard-coded string
Remove unneeded error checking