3 Years Ago
bit of refactoring