Removed unnecessary boilerplate code