formatting tweaks and indexing