Some organization and cleanup.