improve readability a bit