Reformatting + var names change