code optimizations
tagging v. 1.0.1