Initialization code clean up