2 Years Ago
Quick cleanup/refactor after merge