Tidied by files and removed superfluous comments