Removing unnecessary isset checks as discussed.