clean up
updated init