Address review comments from PR #26: * https://github.com/eggheadgames/Siren/pull/26#pullrequestreview-77430026 * https://github.com/eggheadgames/Siren/pull/26#pullrequestreview-77419786 * https://github.com/eggheadgames/Siren/pull/26#pullrequestreview-77421773
