Brushed up helper files