Thx clean and tidy