Cleaned up damage code