Cleaner code. Double check for coordinates