some code clean up's