some cleanup / reorganization
added m4 placeholder