Cleaned up SoundCloud's code