Formatting and comment cleanup