More identation and withe space fixes and improvements