LATSD/TASK19

Minor changes; fixing the contatiners hierarchy. Setting proper
indentation