Tango: Making Y scale more natural, and tidying some code up