Clean Up and Few Style Tweaks