Some silly refactoring