Update for clean code