Merged dpalmero beautify on save