avoid clang warning
reorder member initialization, whitespace cleanup