1. refactoring for location_app module;