Show and list function implementation + cleanup