small tweak and cleanup