Refactored, simplified, static-ified