7 Years Ago
quick refactor