Good point, cleaner, will update