Updated the Display Class

Replace compound conditionals with predicate