RAT ignore .idea / fix Hybrid
Final Refactoring