Further cleaning up of initialization process