Distance variables are now int. Cleaned up a little.