Mostly cosmetic changes to CheckAggroAmount funcs

Also changed some silliness