remove unused astyle options existed only in high version; reformatted code