I did some code clean up