cleanup and minifiction assistance changes