Comment cleanup, structure complete for retryFrom, todo: retryMethod