Renamed some variables removing underscored at start of names and captials at the start of names