V2.0.2 Code cleanup

Code cleanup and width added to example