further compiler cleanup / organization