[ Fixes #62980688 ] Seems like a major update, but it is really only
reorganizing order of functions and defining public and private
functions (I was lazy in the beginning and declared everything public).