[SQUASHME] reverted some files to pre astyle state