Some redundancies corrected