renamed variable to be more consistent

renamed WELCOME_MESSAGE to MESSAGE_WELCOME
added a few {} for syntax

to some if statements