Cleaned up brute-force