Please check this first commit. If it is ok I will do the same thing with other functions.

First commit