Cleanup and adding debug statements