move Kinchin-Pease damage calculation in the correct place
cleanup code