Refactor more code...