Style changes, comment cleanup