Small code refactoring - Introduce noop