code and coding style cleanup
version number update