Improved readability of module