Minor stylistic changes on the program, without functional change