Code Review

- Reviewing code.