refactoring; consolidated show states