Cleaned the library to remove redundant function argument and interface