Refactoring

Version: 0.2.0
Adding some performance enhancements