refactoring for easier use/installation