Add related and do a small tidy