version update
code cleanup