[r] Some small changes to fit personal style