clean up

clean and make stable