5 Years Ago
Bit of refactor & optim.