Restructure conditionals