displayAll commented and cleaned up