just some code clean up