Changed variables to uppercase and added defaults based on feedback.