comment on refactored parts