C
refactoring