cleaned up redundancies