Reformatted some code, names.