Tidied up code locations