Clean up. Reformatted code.