cleanup
refactoring: rename fields