made a little tidier