Removed some boilerplate code