Cleanup and refactoring. Removed hard-coded path to downloads folder.