Cleaning up manual display per @secretiverhyme