Tweaks to make it better
More tweaks and some deletions