Cleaned up some formatting and error messages