Some refactoring for better us of functions in the future