Feature/cleanup wp refactor