Refactor/minor updates