Refactor statement block classes