Make some more code more readable