Minor formatting/cleanup