simplifications and tweaks