code cleanup, comment cleanup