Few Final Code Tweaks