Comment cleanup and add validation precondition