improving enhance-ant target, + some refactor and cleanup