While being at it, you could clean this up