Adding commands to list tabs, introduce variable. Removing unused.