removed boost dependency. Improved code quality.