Save refactor
Pass the phpcs and phpmd
Refactored API for Unit Testing. Added Export