module code and structure cleanup
version number update
coding style cleanup