Added comments and removed unnecessary helper