Brushed up the code