Tweaks, changes and cleanup