Cleanup, trailing spaces etc [ci-skip]