Refs #14 - Make expression inline.
Refs #14 - Use more clear variable name.