Tidied up src