code cleanup
tidying up