3 Years Ago
More code cleanup