Refactor further, especially sources and styles