Minor refactoring and changed map path