Added some indentions to make code more clear

Made section-type naming consistent behind-the-scenes to make any future
editing trivial