k3helpers: Created helpers for map and cleaned up others
cleanup