Some minor modifications

It seems like Clang produces a much faster code than GCC.