simple code clean up