update to use created callback; minor refactoring