Small changes to condition checking logic
Use a char to speed things up a little.