More cleanup
Start refactoring error messages
Make error messages into constants for now
Small changes
Centralize message printer