Formatting cleaned up.