Tidied up pan files