Tidied up - removed some comments