Cleanup, fix display issues with assignments