Tidied source code