Improve consistency with workshop slides