Refactor as Kevin requested.