changed some indenting