cleaned the fir class work in progress