Indenting issues solved