small cleaning up of code