Fix build error, reformat some code as issue with tabs/spaces