made the new clean code actually work