minor c5 refactoring