Slight formatting improvements