Dani Mcclure: clean and modern

Breaking