Small refactoring - Introduce noop