cleanup and working on map controller