Tidier lines for easy forking