Overall cleanup, mostly trailing white spaces