minor refactoring
Refactored and added google maps option
Fix default parameter bugs