Cleaning sources & creating controllers