5 Years Ago
refactor a bit