Attempt to fix assigns.
Minor improvements?