LP: move forward decl, reindent, misc