Tidied up source