Finalize content
2 forgotten indexes
Integrate comments from reviewer: @aivaloglou