Some style changes and introduction of more readability.