Cleaned up the Combat Rules