Address @Snuffleupagus, @mduan, @jviereck, @brendandahl comments.