fixed error
code clean up