refactoring cont...