Feature/cleanup wp refactor

@gannetson I think we still have tabs / spaces here.