3842 Make the code a bit easier to read