Make code clearer (as suggested by jesus2099)

See #231.