Some corrections for a better quality source code