Do not remove trailing whitespace -- put into function
Update submodules