Refactoring - no additional functionality