clean code and naming convention
clean warning