New changes to clean code