Removing unnecessary boilerplate