code cleanup
changed version