Could’ve been a bit tidier