refactored fluid code
dont know what i did but it looks cloudy