Refactor more code: