Good place but need some tidy