Remove unused variable
Minor refactoring
Add location accuracy to marker fields