Move comments to the correct location

Remove array extension usage

Move build options to fixture to match view