Fine tunes to function naming, identation.