Simplified some assignments