Cleaning up an IF
Making sure that we don't call this
Cleaner code
More debug output