A little cleanup, Merge into master