Tidied up the lens