Usings removed, some formatting, toolchain updates