tidier? maybe