Tweak 2
Rename some functions
Minor code changes
Reorder some functions (no code changes)
Comment changes
Tweak