Cleanups and boilerplate