Begin enhancements.  Change coding style