Little style changes and added Imdex.h