clean up function + better visuel day