(Boroken) A little code cleanup
(Broken) You have no clue how happy I'll be when I find this error.