Cleaned up results a bit more