Cleanup, fix minor display bug