Commented and changed var names