Cleanup, commenting