Cleanup
Item cleanups + docs