using unless for label condition and cleaning up