diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/ScheduleServiceInjectionModule.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/ScheduleServiceInjectionModule.java
index e54427866918..38207f4cdd14 100644
--- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/ScheduleServiceInjectionModule.java
+++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/ScheduleServiceInjectionModule.java
@@ -23,16 +23,45 @@
 import com.hedera.node.app.service.schedule.impl.handlers.ScheduleSignHandler;
 import dagger.Module;
 
+/**
+ * Schedule service injection interface. Used to inject the schedule service handlers into the
+ * implementation class using Dagger dependency injection
+ */
 @Module
 public interface ScheduleServiceInjectionModule {
 
+    /**
+     * Schedule create handler
+     *
+     * @return the schedule create handler
+     */
     ScheduleCreateHandler scheduleCreateHandler();
 
+    /**
+     * Schedule delete handler
+     *
+     * @return the schedule delete handler
+     */
     ScheduleDeleteHandler scheduleDeleteHandler();
 
+    /**
+     * Schedule get info handler
+     *
+     * @return the schedule get info handler
+     */
     ScheduleGetInfoHandler scheduleGetInfoHandler();
 
+    /**
+     * Schedule sign handler
+     *
+     * @return the schedule sign handler
+     */
     ScheduleSignHandler scheduleSignHandler();
 
+    /**
+     * Schedule handlers
+     *
+     * @return the schedule handlers
+     */
     ScheduleHandlers scheduleHandlers();
 }
diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/ScheduleStoreUtility.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/ScheduleStoreUtility.java
index bf228d93aa59..40ce0ea56d9e 100644
--- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/ScheduleStoreUtility.java
+++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/ScheduleStoreUtility.java
@@ -31,11 +31,20 @@
 import java.util.Collections;
 import java.util.Objects;
 
+/**
+ * Provides utility methods for the schedule store.
+ * Used to calculate the hash of a schedule which is then used to store the schedule in the schedule store.
+ * */
 public final class ScheduleStoreUtility {
     private ScheduleStoreUtility() {}
 
-    // @todo('7773') This requires rebuilding the equality virtual map on migration,
-    //      because it's different from ScheduleVirtualValue (and must be, due to PBJ shift)
+    /**
+     * Calculate bytes hash of a schedule based on the schedule's memo, admin key, scheduled transaction, expiration
+     * time, and wait for expiry flag.
+     *
+     * @param scheduleToHash the schedule to hash
+     * @return the bytes
+     */
     @SuppressWarnings("UnstableApiUsage")
     public static Bytes calculateBytesHash(@NonNull final Schedule scheduleToHash) {
         Objects.requireNonNull(scheduleToHash);
@@ -77,6 +86,22 @@ private static boolean isScheduleInList(final ScheduleID scheduleId, final Sched
                 .anyMatch(s -> s.scheduleIdOrThrow().equals(scheduleId));
     }
 
+    /**
+     * Adds a {@link Schedule} to a {@link ScheduleList}, replacing it if it already exists.
+     *
+     * <p>This method checks if the provided {@code Schedule} is already present in the {@code ScheduleList}.
+     * If it is, the existing {@code Schedule} is replaced with the new one. If it isn't, the {@code Schedule}
+     * is added to the list. This allows for updating entries within a {@code ScheduleList} without needing to
+     * manually manage duplicates or replacements.
+     *
+     * @param schedule The {@link Schedule} to add or replace in the {@code ScheduleList}. Must not be {@code null},
+     *     unless the {@code ScheduleList} is also {@code null}.
+     * @param scheduleList The {@link ScheduleList} to which the {@code Schedule} will be added or replaced. May be
+     *     {@code null}, in which case a new {@link ScheduleList} containing only the provided
+     *     {@code Schedule} is returned.
+     * @return A new {@link ScheduleList} containing the {@code Schedule} either added or replacing an existing one.
+     *     Never returns {@code null}.
+     */
     static ScheduleList addOrReplace(final Schedule schedule, @Nullable final ScheduleList scheduleList) {
         if (scheduleList == null) {
             return new ScheduleList(Collections.singletonList(schedule));
diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/codec/ScheduleServiceStateTranslator.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/codec/ScheduleServiceStateTranslator.java
index 0251fd0abe48..51db8522cf48 100644
--- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/codec/ScheduleServiceStateTranslator.java
+++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/codec/ScheduleServiceStateTranslator.java
@@ -42,11 +42,24 @@
 import java.util.Objects;
 import java.util.Optional;
 
+/**
+ * Utility class used for conversion of schedule virtual values to schedules.
+ * @deprecated Since there should not be anymore ScheduleVirtualValue objects in state,
+ * this class should no longer be required and will be removed in a future release
+ */
+@Deprecated(forRemoval = true)
 public final class ScheduleServiceStateTranslator {
     private static final int ED25519_KEY_LENGTH = 32;
 
     private ScheduleServiceStateTranslator() {}
 
+    /**
+     * Convert schedule virtual value to schedule.
+     *
+     * @param virtualValue the virtual value
+     * @return the schedule
+     * @throws ParseException if there is an error parsing the TransactionBody message
+     */
     public static Schedule convertScheduleVirtualValueToSchedule(
             @NonNull final com.hedera.node.app.service.mono.state.virtual.schedule.ScheduleVirtualValue virtualValue)
             throws ParseException {
@@ -142,6 +155,14 @@ private static Timestamp getResolutionTime(@NonNull final ScheduleVirtualValue v
         else return null;
     }
 
+    /**
+     * Migrates the state of the schedule service from the scheduleId to the schedule virtual value
+     * using the readableStore and the ScheduleId.
+     *
+     * @param scheduleID the schedule id
+     * @param readableScheduleStore the readable schedule store
+     * @return the schedule virtual value
+     */
     @NonNull
     public static com.hedera.node.app.service.mono.state.virtual.schedule.ScheduleVirtualValue pbjToState(
             @NonNull final ScheduleID scheduleID, @NonNull final ReadableScheduleStore readableScheduleStore) {
@@ -154,6 +175,12 @@ public static com.hedera.node.app.service.mono.state.virtual.schedule.ScheduleVi
         return pbjToState(optionalSchedule);
     }
 
+    /**
+     * Converts a {@link Schedule} object to a {@link ScheduleVirtualValue}
+     * *
+     * @param schedule the schedule
+     * @return the schedule virtual value
+     */
     @NonNull
     public static com.hedera.node.app.service.mono.state.virtual.schedule.ScheduleVirtualValue pbjToState(
             @NonNull final Schedule schedule) {
diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java
index 68db4570dd80..da33c554d358 100644
--- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java
+++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/AbstractScheduleHandler.java
@@ -60,12 +60,22 @@ abstract class AbstractScheduleHandler {
 
     /**
      * A simple record to return both "deemed valid" signatories and remaining primitive keys that must sign.
+     *
      * @param updatedSignatories a Set of "deemed valid" signatories, possibly updated with new entries
      * @param remainingRequiredKeys A Set of Key entries that have not yet signed the scheduled transaction, but
      *     must sign that transaction before it can be executed.
      */
     protected static record ScheduleKeysResult(Set<Key> updatedSignatories, Set<Key> remainingRequiredKeys) {}
 
+    /**
+     * Gets the set of all the keys required to sign a transaction.
+     *
+     * @param scheduleInState the schedule in state
+     * @param context the Prehandle context
+     * @return the set of keys required to sign the transaction
+     * @throws PreCheckException if the transaction cannot be handled successfully due to a validation failure of the
+     * dispatcher related to signer requirements or other pre-validation criteria.
+     */
     @NonNull
     protected Set<Key> allKeysForTransaction(
             @NonNull final Schedule scheduleInState, @NonNull final PreHandleContext context) throws PreCheckException {
@@ -78,6 +88,14 @@ protected Set<Key> allKeysForTransaction(
         return getKeySetFromTransactionKeys(keyStructure);
     }
 
+    /**
+     * Get the schedule keys result to sign the transaction
+     *
+     * @param scheduleInState the schedule in state
+     * @param context         the Prehandle context
+     * @return the schedule keys result containing the updated signatories and the remaining required keys
+     * @throws HandleException if any validation check fails when getting the keys for the transaction
+     */
     @NonNull
     protected ScheduleKeysResult allKeysForTransaction(
             @NonNull final Schedule scheduleInState, @NonNull final HandleContext context) throws HandleException {
@@ -144,6 +162,13 @@ protected void verifyHasNewSignatures(
             throw new HandleException(ResponseCodeEnum.NO_NEW_VALID_SIGNATURES);
     }
 
+    /**
+     * Gets key for account.
+     *
+     * @param context        the handle context
+     * @param accountToQuery the account to query
+     * @return the key for account
+     */
     @Nullable
     protected Key getKeyForAccount(@NonNull final HandleContext context, @NonNull final AccountID accountToQuery) {
         final ReadableAccountStore accountStore = context.readableStore(ReadableAccountStore.class);
@@ -276,6 +301,18 @@ protected void checkValidTransactionId(@Nullable final TransactionID currentId)
         if (validStart == null) throw new PreCheckException(ResponseCodeEnum.INVALID_TRANSACTION_START);
     }
 
+    /**
+     * Try to execute a schedule. Will attempt to execute a schedule if the remaining signatories are empty
+     * and the schedule is not waiting for expiration.
+     *
+     * @param context              the context
+     * @param scheduleToExecute    the schedule to execute
+     * @param remainingSignatories the remaining signatories
+     * @param validSignatories     the valid signatories
+     * @param validationResult     the validation result
+     * @param isLongTermEnabled    the is long term enabled
+     * @return boolean indicating if the schedule was executed
+     */
     protected boolean tryToExecuteSchedule(
             @NonNull final HandleContext context,
             @NonNull final Schedule scheduleToExecute,
@@ -314,6 +351,12 @@ protected boolean tryToExecuteSchedule(
         }
     }
 
+    /**
+     * Checks if the validation is OK, SUCCESS, or SCHEDULE_PENDING_EXPIRATION.
+     *
+     * @param validationResult the validation result
+     * @return boolean indicating status of the validation
+     */
     protected boolean validationOk(final ResponseCodeEnum validationResult) {
         return validationResult == ResponseCodeEnum.OK
                 || validationResult == ResponseCodeEnum.SUCCESS
diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java
index 56efce6a2581..d5a7239df7af 100644
--- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java
+++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/HandlerUtility.java
@@ -43,6 +43,12 @@
 public final class HandlerUtility {
     private HandlerUtility() {}
 
+    /**
+     * Return child as ordinary transaction body.
+     *
+     * @param scheduleInState the schedule in state to convert to transaction body
+     * @return the transaction body
+     */
     @NonNull
     public static TransactionBody childAsOrdinary(@NonNull final Schedule scheduleInState) {
         final TransactionID scheduledTransactionId = transactionIdForScheduled(scheduleInState);
@@ -109,6 +115,11 @@ public static TransactionBody childAsOrdinary(@NonNull final Schedule scheduleIn
         return ordinary.build();
     }
 
+    /**
+     * Given a Transaction of one type, return the corresponding HederaFunctionality.
+     * @param transactionType the transaction type
+     * @return the hedera functionality
+     */
     static HederaFunctionality functionalityForType(final DataOneOfType transactionType) {
         return switch (transactionType) {
             case CONSENSUS_CREATE_TOPIC -> HederaFunctionality.CONSENSUS_CREATE_TOPIC;
@@ -170,11 +181,27 @@ static Schedule markExecuted(@NonNull final Schedule schedule, @NonNull final In
                 .build();
     }
 
+    /**
+     * Replace the signatories of a schedule with a new set of signatories.
+     * The schedule is not modified in place.
+     *
+     * @param schedule       the schedule
+     * @param newSignatories the new signatories
+     * @return the schedule
+     */
     @NonNull
     static Schedule replaceSignatories(@NonNull final Schedule schedule, @NonNull final Set<Key> newSignatories) {
         return schedule.copyBuilder().signatories(List.copyOf(newSignatories)).build();
     }
 
+    /**
+     * Replace signatories and mark executed schedule.
+     *
+     * @param schedule       the schedule
+     * @param newSignatories the new signatories
+     * @param consensusTime  the consensus time
+     * @return the schedule
+     */
     @NonNull
     static Schedule replaceSignatoriesAndMarkExecuted(
             @NonNull final Schedule schedule,
@@ -230,6 +257,16 @@ static Schedule createProvisionalSchedule(
         return builder.build();
     }
 
+    /**
+     * Complete the processing of a provisional schedule, which was created during a ScheduleCreate transaction.
+     * The schedule is completed by adding a schedule ID  and signatories.
+     *
+     * @param provisionalSchedule the provisional schedule
+     * @param newEntityNumber     the new entity number
+     * @param finalSignatories    the final signatories for the schedule
+     * @return the schedule
+     * @throws HandleException if the transaction is not handled successfully.
+     */
     @NonNull
     static Schedule completeProvisionalSchedule(
             @NonNull final Schedule provisionalSchedule,
@@ -247,6 +284,15 @@ static Schedule completeProvisionalSchedule(
         return build.build();
     }
 
+    /**
+     * Gets next schedule id for a given parent transaction id and new schedule number.
+     * The schedule ID is created using the shard and realm numbers from the parent transaction ID,
+     * and the new schedule number.
+     *
+     * @param parentTransactionId the parent transaction id
+     * @param newScheduleNumber   the new schedule number
+     * @return the next schedule id
+     */
     @NonNull
     static ScheduleID getNextScheduleID(
             @NonNull final TransactionID parentTransactionId, final long newScheduleNumber) {
@@ -257,6 +303,12 @@ static ScheduleID getNextScheduleID(
         return builder.scheduleNum(newScheduleNumber).build();
     }
 
+    /**
+     * Transaction id for scheduled transaction id.
+     *
+     * @param valueInState the value in state
+     * @return the transaction id
+     */
     @NonNull
     static TransactionID transactionIdForScheduled(@NonNull Schedule valueInState) {
         // original create transaction and its transaction ID will never be null, but Sonar...
@@ -287,6 +339,13 @@ private static long calculateExpiration(
         }
     }
 
+    /**
+     * Filters the signatories to only those that are required.
+     * The required signatories are those that are present in the incoming signatories set.
+     *
+     * @param signatories the signatories
+     * @param required    the required
+     */
     static void filterSignatoriesToRequired(Set<Key> signatories, Set<Key> required) {
         final Set<Key> incomingSignatories = Set.copyOf(signatories);
         signatories.clear();
diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleGetInfoHandler.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleGetInfoHandler.java
index da7adf2db5c5..d6256c322f0a 100644
--- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleGetInfoHandler.java
+++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleGetInfoHandler.java
@@ -55,6 +55,12 @@
 public class ScheduleGetInfoHandler extends PaidQueryHandler {
     private final ScheduleOpsUsage legacyUsage;
 
+    /**
+     * Constructor is used by the Dagger dependency injection framework to provide the necessary dependencies to the handler.
+     * The handler is responsible for handling the {@link HederaFunctionality#SCHEDULE_GET_INFO} query.
+     *
+     * @param legacyUsage the legacy usage
+     */
     @Inject
     public ScheduleGetInfoHandler(ScheduleOpsUsage legacyUsage) {
         this.legacyUsage = legacyUsage;
diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleHandlers.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleHandlers.java
index 7eddc2c3e74f..f5682d39d1f3 100644
--- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleHandlers.java
+++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/handlers/ScheduleHandlers.java
@@ -22,6 +22,9 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+/**
+ * Singleton that provides access to the various handlers for the Schedule Service.
+ */
 @Singleton
 public class ScheduleHandlers {
 
@@ -33,6 +36,14 @@ public class ScheduleHandlers {
 
     private final ScheduleSignHandler scheduleSignHandler;
 
+    /**
+     * Instantiates a new Schedule handler.
+     *
+     * @param scheduleCreateHandler  the schedule create handler
+     * @param scheduleDeleteHandler  the schedule delete handler
+     * @param scheduleGetInfoHandler the schedule get info handler
+     * @param scheduleSignHandler    the schedule sign handler
+     */
     @Inject
     public ScheduleHandlers(
             @NonNull final ScheduleCreateHandler scheduleCreateHandler,
@@ -45,18 +56,38 @@ public ScheduleHandlers(
         this.scheduleSignHandler = requireNonNull(scheduleSignHandler, "scheduleSignHandler must not be null");
     }
 
+    /**
+     * Schedule create handler.
+     *
+     * @return the schedule create handler
+     */
     public ScheduleCreateHandler scheduleCreateHandler() {
         return scheduleCreateHandler;
     }
 
+    /**
+     * Schedule delete handler.
+     *
+     * @return the schedule delete handler
+     */
     public ScheduleDeleteHandler scheduleDeleteHandler() {
         return scheduleDeleteHandler;
     }
 
+    /**
+     * Schedule get info handler.
+     *
+     * @return the schedule get info handler
+     */
     public ScheduleGetInfoHandler scheduleGetInfoHandler() {
         return scheduleGetInfoHandler;
     }
 
+    /**
+     * Schedule sign handler.
+     *
+     * @return the schedule sign handler
+     */
     public ScheduleSignHandler scheduleSignHandler() {
         return scheduleSignHandler;
     }
diff --git a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/schemas/V0490ScheduleSchema.java b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/schemas/V0490ScheduleSchema.java
index eb3dd2c6014a..2fc2b22ade04 100644
--- a/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/schemas/V0490ScheduleSchema.java
+++ b/hedera-node/hedera-schedule-service-impl/src/main/java/com/hedera/node/app/service/schedule/impl/schemas/V0490ScheduleSchema.java
@@ -64,6 +64,9 @@ public final class V0490ScheduleSchema extends Schema {
      */
     private static MerkleScheduledTransactions fs;
 
+    /**
+     * Instantiates a new V0490 (version 0.49.0) schedule schema.
+     */
     public V0490ScheduleSchema() {
         super(VERSION);
     }
@@ -181,6 +184,11 @@ private static StateDefinition<ProtoBytes, ScheduleList> schedulesByEquality() {
                 SCHEDULES_BY_EQUALITY_KEY, ProtoBytes.PROTOBUF, ScheduleList.PROTOBUF, MAX_SCHEDULES_BY_EQUALITY);
     }
 
+    /**
+     * Used to migrate the state to the new schema. It is not thread safe and is set to null after migration.
+     *
+     * @param fs the state to migrate from
+     */
     public static void setFs(@Nullable final MerkleScheduledTransactions fs) {
         V0490ScheduleSchema.fs = fs;
     }
diff --git a/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ScheduleRecordBuilder.java b/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ScheduleRecordBuilder.java
index 3fcf0be45316..78a0e2aff8c6 100644
--- a/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ScheduleRecordBuilder.java
+++ b/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ScheduleRecordBuilder.java
@@ -30,12 +30,30 @@
  * transaction other than a ScheduleCreate, ScheduleSign, or ScheduleDelete.
  */
 public interface ScheduleRecordBuilder {
+    /**
+     * Schedule ref schedule record builder.
+     *
+     * @param scheduleRef the schedule ref
+     * @return the schedule record builder
+     */
     @NonNull
     ScheduleRecordBuilder scheduleRef(ScheduleID scheduleRef);
 
+    /**
+     * Schedule id schedule record builder.
+     *
+     * @param scheduleID the schedule id
+     * @return the schedule record builder
+     */
     @NonNull
     ScheduleRecordBuilder scheduleID(ScheduleID scheduleID);
 
+    /**
+     * Scheduled transaction id schedule record builder.
+     *
+     * @param scheduledTransactionID the scheduled transaction id
+     * @return the schedule record builder
+     */
     @NonNull
     ScheduleRecordBuilder scheduledTransactionID(TransactionID scheduledTransactionID);
 }
diff --git a/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ScheduleService.java b/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ScheduleService.java
index 2db666bf9cb0..00894c9c5103 100644
--- a/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ScheduleService.java
+++ b/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ScheduleService.java
@@ -38,6 +38,11 @@ default String getServiceName() {
         return NAME;
     }
 
+    /**
+     * Returns the RPC definitions for the service
+     *
+     * @return the RPC definitions
+     */
     @NonNull
     @Override
     default Set<RpcServiceDefinition> rpcDefinitions() {
diff --git a/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ScheduleServiceDefinition.java b/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ScheduleServiceDefinition.java
index a5279ad1fe5e..f8efe9fe33eb 100644
--- a/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ScheduleServiceDefinition.java
+++ b/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/ScheduleServiceDefinition.java
@@ -33,8 +33,14 @@
  */
 @SuppressWarnings("java:S6548")
 public final class ScheduleServiceDefinition implements RpcServiceDefinition {
+    /**
+     * The global singleton ScheduleServiceDefinition INSTANCE.
+     */
     public static final ScheduleServiceDefinition INSTANCE = new ScheduleServiceDefinition();
 
+    /**
+     * The set of methods supported by the Schedule Service.
+     */
     private static final Set<RpcMethodDefinition<?, ?>> methods = Set.of(
             new RpcMethodDefinition<>("createSchedule", Transaction.class, TransactionResponse.class),
             new RpcMethodDefinition<>("signSchedule", Transaction.class, TransactionResponse.class),
@@ -47,12 +53,22 @@ private ScheduleServiceDefinition() {
         requireNonNull(CommonUtils.class);
     }
 
+    /**
+     * Returns the base path for the Schedule Service
+     *
+     * @return the base path
+     */
     @Override
     @NonNull
     public String basePath() {
         return "proto.ScheduleService";
     }
 
+    /**
+     * Returns the set of methods supported by the Schedule Service
+     *
+     * @return the methods
+     */
     @Override
     @NonNull
     public Set<RpcMethodDefinition<?, ?>> methods() {
diff --git a/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/WritableScheduleStore.java b/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/WritableScheduleStore.java
index e5d5430f4be6..2a3c5c3349c6 100644
--- a/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/WritableScheduleStore.java
+++ b/hedera-node/hedera-schedule-service/src/main/java/com/hedera/node/app/service/schedule/WritableScheduleStore.java
@@ -22,27 +22,45 @@
 import edu.umd.cs.findbugs.annotations.Nullable;
 import java.time.Instant;
 
+/**
+ * The interface Writable schedule store.
+ */
 public interface WritableScheduleStore extends ReadableScheduleStore {
 
     /**
      * Delete a given schedule from this state.
-     * Given the ID of a schedule and a consensus time, delete that ID from this state as of the
-     * consensus time {@link Instant} provided.
+     * Given the ID of a schedule and a consensus time, delete that ID from
+     * this state as of the consensus time {@link Instant} provided.
+     *
      * @param scheduleToDelete The ID of a schedule to be deleted.
      * @param consensusTime The current consensus time
-     * @throws IllegalStateException if the {@link ScheduleID} to be deleted is not present in this state,
-     *     or the ID value has a mismatched realm or shard for this node.
+     * @return the schedule
+     * @throws IllegalStateException if the {@link ScheduleID} to be deleted is not present in this state, or the ID
+     *     value has a mismatched realm or shard for this node.
      */
     Schedule delete(@Nullable final ScheduleID scheduleToDelete, @NonNull final Instant consensusTime);
 
+    /**
+     * Given the ID of a schedule, return a mutable reference to the schedule in this state.
+     *
+     * @param idToFind The ID to find
+     * @return the Schedule to modify
+     */
     Schedule getForModify(final ScheduleID idToFind);
 
+    /**
+     * Add a schedule to this state.
+     * If the schedule already exists it will be replaced.
+     *
+     * @param scheduleToAdd The schedule to add
+     */
     void put(Schedule scheduleToAdd);
 
     /**
      * Purges expired schedules from the store.
+     *
      * @param firstSecondToExpire The consensus second of the first schedule to expire.
-     * @param lastSecondToExpire The consensus second of the last schedule to expire.
+     * @param lastSecondToExpire  The consensus second of the last schedule to expire.
      */
     void purgeExpiredSchedulesBetween(long firstSecondToExpire, long lastSecondToExpire);
 }