Refactoring for the tidyness