code cleanup
cam