Several improvements
Improved with WordPress constants