Cleaned up code even more for river data