Tidier and more accurate