just a bit of clean up in the code