Ppong/refactor

placeholder