Removing boilerplate