Clean up section initializer, move stuff to field