Removed legacy commented code
Tidied initialisers