Clean up init code and comment patterns.