reorganize init defines

I think this looks better.