Tidied up lang