Cleaned up diffusion further
Removed layer of functions from advection