Make the code a bit more consistent