Refactor after Phillip review