Added cleanup and polish