cleanup and added simple text collector