Remove unnecessarily duplicated functions
Merge pull request #9 from msabramo/remove_duplicated_functions

Remove unnecessarily duplicated functions