Removed some boilerplate