Fix Live TV not updating

Should resolve issues with live tv not updating. Also movre
optimization and work on PEP8 compliance.