Refactored Code for WordPress Standards
Refactor and Bug Fixing