some code clean up while reading thru