Improve boilerplate