Refactoring/streamlining