minimal prettyfied changes made