Check for Aces corrected

commented out code and did some refactoring