Tidied up and moving towards using deadbolt