Cleaned up a little duplication. Tom