Remove boilerplate
Reduce indenting