key: cleaned up the assembly a bit.