Clean up but still broken

At least it passes lint now, sort of.