I'm already getting yelled at for all the cleanup I've been doing to old files, so I might as well fix this one also :)