Cleaning up the Code and Typo fix.