Sources cleanup and some typo fixes