Small improvements on the theme