Tidied up Hubo LIVE code. Closes #6