Removed debug code, fixed list display