Removing some boilerplate code