General cleanup and docs