cleaned up initializer
Merge branch 'cleanupInitializer'