Style changes suggested by Kyle