Some clean up of code, comments.