A few minor tweaks.
Some minor refactoring of prototype declaration.