Improve code variable names and output message