cleanup and removed need for .txt file