Some refactoring, changed random source
Start refactor