Fix coding style
739 tickets
Drop unnecessary index