code cleanup and class function protection
version number update
coding style cleanup