Code cleanup, more compact memory layout.