Title: Fix It, Clean It and Make It Last