Removing unnessary boilerplate