Code cleanup and small fixes for Index@Home