code & comment cleanup