Some cleaning up has been done