cleaned this mess up a little bit :)