cleaned up tab completion