Tidied up todos and class names.