just some cleaning up of code.