Simplify code in response to Glasser's code review