Refactor/minor changes