index and cleanup for bestpractices