Some code refactor on library