Cleaner re-write.