Cleanup, more documentation