Partial refactor commit

For blog post