Tidy as guided by formatR