Add point to code blocks, remove redundant question sections, add DI code example