Some cleanup and init changes