small improvements on the theme #69