Canalize the fetching arguments algorith to one method; Fix text misspelling; Rename return types; Code cleaning.