Improved readability and fixed typos