Cleaned up Initialization events a bit