Moved instance-specific variables into init;