rework code blocks