refactoring/removing smoke rings