buildsystem: clean up and cosmetics