Tweaks and refactoring