[simeon] more refactoring