Inline comments clean up