everything tidier now