better index & structured comments