Refactor, podify