Some formatting touches