Minor formatting / cleanup