Refactored. Even more better.