Put initialize params back on one line, and move attr_accessors.

As per @hdm's feedback