refactoring - config and rest separat