Less duplication in __init__().
Updated README to reflect changes.