Removed in-line if statements that only returned true or false