Constructor refactor