Refactoring sources etc.