Small Changes to instructions
Extract display to separate class