Try to improve readability a bit