Conclusion and discussion
Remove some comments
Switch to author/year citations