Cleaned up imports, parameterized Map.Entry