Some refactor and rm lines