Improved readability #374