Make the code look a little tidier