Cleanup/organize.