Fixing all exceptions and cleaning up code to be more obvious in behavior