refactor: pushing tweaks to the finish line