Cleaning
Tweaked judge a bit