did some code clean up