Remove unneeded comments and display() method