Refactored welcome code