Tidy

Tidied source