Minor clean ups
Move damage logic to health component