Minor refuctoring to impove readability