TMB-1 : clean code with Lombok