Code optimization
:lipstick: Refactor commit message