Adding clean boilerplate