In the middle of refactoring return args