Simplify syntax
Add timing
Indent code