avoid clang warning
reorder member initialization, whitespace cleanup
Merge branch 'fixGccWarnings20140628'