Removed unused imports
Added try catch for when markers cannot be updated
Removed portrait screenOrientation
Changed string keys for Maps into constants
Removed hard coded strings