Formatting clean-up (cont.)