possibility to switch on/off surface charge contribution in poisson equation and cleanup of code