Brushed up the code a little bit