Cleanup, inline docs