clean up of imports and small refactoring in MapPane