small if statement cleanup for coherency and elegancy