Don/Chris - Refactoran dem shits