Improve results presentation and code cleanup