Code & comment cleanup