Tidied naming and added todo comment