reordered some methods in the Main class
fixed formatting
removed database stuff
Merge branch 'master' into database
fixed formatting
fixed formatting
cleaned up exception cases