Update conditionals statements for better readability