Code cleanup. No more if( !