few minor tweaks to improve config/simplify codebase