Exceptions are fixed + cleaned up some code