Performance improvements
Alter some indenting