Refactored the code slightly to get rid of some redundant code
App is working.  I notice there is some anomaly with adding marker Lat and Long.  It seems that the variables change names.  I will check into that