Add comments
Put every expand rule into a separate file