better spacing
Remove redundant reminder
more flexibility