code clean up based on merge request comments.
compilation warnings fixed.