Refactored some code, removed "Nation" class