Misc cleaning and docs