Follow-up work for SoundCloud and code cleanup.