more refactoring for jade