Revert some changes f***ed up by astyle