Refactor/improvements