Refactor in progress - cleaning...