Cleaner SQL statement, limited testing.