use make vars
clean out some useless comments