Fix indentations and removed old code/added missing code.