Fix DLL hell; reindent