formatting, everything compiling properly under gcc/clang