Varaible name refactor
Add comments