Formatting slowly but surely cleaned up.