Code refactor. Btw, the previous commit was OK.