Tweaks and cleaned