cleanup of code/comments etc