Address non-critical comments from @nemo794 in PR #21

[gshiroma]

PR #21 was merged for the cal/val delivery without addressing comments from @nemo794 that were considered non-critical for the delivery. All comments should be addressed and resolved before closing this issue.

Originally posted by @nemo794 in #21 (review)