v1.0 after code analysis and clean-up