if statement improvements.