Changed some fluid stuff

Made the code nicer