Removed unnecessary calculations