Revert "did some code cleanup"

Reverts skazer/WPBasalCart#1