Refactor code...