MapActivity was refactored. Things were extracted. Some renaming was done throughout the app.