allow streaming options of either 180 or 360p. Tidy up code