Refactor condition to be more concise #106