small bit of cleanup and polish