fix gccism & style