Refactor: code cleaning.