refactoring of Meteor::Core::Kernel