Multiple changes; indent fixed