Cleaing up a few things I've been meaning to do for ages.