Documentation, cleanup, organization