mostly formatting improvements