Cleanup and reformatted the code in preparation for 10.3.0 final. Fixed an API change problem