ReStart & Clean Code