Fix clean code