Fix formatting, and one-index suggestions for user