Remove commented code
Add proper results handling