And addressed the note from previous commit, and deleted unneeded/confusing public methods.