Refactored. Clean!