Do a little bit more refactoring
Merge branch '0_procarray' into 1_index_struc