Commented and corrected Display class