Removed superfluous variable and hid within objects