A little cleaner but still broken