(^) code refactoring