Tidied + removed old commented code.