* Refactor & Minor enhancements