Updated comments/changed var names to be relevant