Cleaned up wind direction logic

Still not fully tested