cleaning up some formatting
starting to work on error and exception handling