Updated boilerplate
Cleaned indents