refactor and presentation updates