More Comments and Formatting.