[Issue #199] Using more idiomatic Swift