Plugged in comments in clean-ish way