Improved readability of both files.