Small changes / format adjustments