mostly formatting fixes