final tweaks to simplify things