Removing some boilerplate