Fluid render for canister + some code clean up