Stopped polluting namespace and improved readability. Also fixed MediaStop implementation for Pandora.