Updated license text, made method naming & pattern more consistent.