- removed some redundant variables