[Dev] Refactor code.