started code clean up