Fixed trailing space, cleanups