Edited comments and adjusted variable naming