Refactoring misunderstood parts