indent file more current, fix bug jsonify when macros is not defined