CODE: Cleanup of fight.c