code clean up & ver. update.