formatting
little cleanups, join rather than collect
project has moved