improved code-legibility a little