Fix some over zealous indenting and prepare fileupload for removal of jquery