Cleaned up variable names in voxel/map