Minor code cleanup
Created ZIP for v. 2.0.1