Started fixing bad variable names. Also, __init__ doc string too long.