Refactor and removed welcome