code cleanup, improve welcome message