Cleaned up assignment function