(Refactor) Move some methods to Secret.
tidy.