Cleanups cleanup, oh those trailing whitespaces