Final touches to boilerplate