Clearance

Some clearance and changes on variable names