removing __dict__ calls and splitting up function args to make lines shorter