code cleanup for welcome module