removed some redundancies