Removed some boilerplate, added some boilerplate