Fluids Code cleanup + Bucket